Implement merging Cargo.toml file with workspace file #3988
Conversation
Loosely parse everything that could be in a Cargo.toml file
Allow reusing the parsed result.
When there is a line > key = """ the value starts and ends with the delimitter wrongly terminating the value parser. Check that there is anything else first.
'#'-signs can be embedded in strings
Resolve backreferences like `authors.workspace = true`
We use the line number only outside the loop which triggers > Loop control variable 'num' not used within the loop body. If this is intended, start the name with an underscore.
Flamefire
force-pushed
the
cargo_inherit_workspace
branch
from
c5ac95a to
50602d7
Compare
|
Test report by @Flamefire Overview of tested easyconfigs (in order)
Build succeeded for 108 out of 115 (total: 14 hours 23 mins 29 secs) (115 easyconfigs in total) |
1 participant
Resolve backreferences like
authors.workspace = truehttps://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table
For ruff-0.14.3 the salsa crate is using the
[workspace.package]section where one can define values that can be inherited by membersSo the members
Cargo.tomlfile contains e.g.For the offline builds we need to copy the members to standalone packages which has the side-effect that no "workspace" exists anymore causing
cargoto fail withChecking
cargo vendoroutput: It replacesversion.workspace = truebyversion = "1.2.3"Hence we need to parse both TOML files, "merge" them to replace those references and write the result to the member
Cargo.tomlFor that I enhanced the minimal TOML parser I implemented for the
"members"key to create adict[str, dict[str, str]]with sections as outer keys, keys as inner keys mapping the 1:1 copy of the value. I.e. I don't parse the value at all besides trying to find the end: TOML values support lists, strings (single & double quotes), multiline strings (triple quotes), bools, numbersThe above example results in Python:
{ 'package': { "name": '"bar"', "version.workspace": 'true', "authors.workspace": 'true', "description.workspace": 'true', "documentation.workspace": 'true', }, 'dependencies': { "leptos": '{ version = "0.6", features = ["csr"] }', }, }This works because we only need to copy the value 1:1 to the member file but doesn't support everything:
Member:
would require merging the mappings, i.e.
dict.update()in Python instead of a simple replacement.But for that we likely need a proper TOML parser:
tomllibtomlpackage on PYPItomlipackage on PYPItomliso we couldimport pip._vendor.tomliSo my idea would be to try importing
tomllib,tomli,import pip._vendor.tomli,tomlin this order if the previous ones failed and error out if none are availableOr we stick with the minimal parser and extend if only necessary: YAGNI